Updated some paths to use macros instead