[HW]	-- Remodelling data tier, was a bit bloated before