Adding some helpers and macros