WIP: Refactor hash syntax