Made build system work