Making it easier to build