Make building easier