Added macros for ISER and SRP