Less magical services + macros