Moved gsp to service macros