Updated to use macro build settings