Added macros for simplification