Removed some logging
Added migration
Changed some names