Add macro for simulator