All macros implemented, modified build and dependencies created