Update build settings
Use modules