Refactor

Add several default macros