Revert controller changes for now, need to discuss reference data types