Update to use as custom package for in-house projects