Add more build options