Switched models to DataMapper