Started working on support for builds