Removed the need for Preamble and renamed helpers