Added more build system options