Renamed some methods while implementing an actual database