Improved build so it can be used without the profile