Added some building options, check if ok!