added TYPE_ macros