Temporary fix for #36

Still need to remove this from the data model