let's leave it as is for now and if the need arises, we can break it out and release a new version