Make AMD compliant
WIP
Rename getOrCreate to fetchOrSave