More boilerplate, added some database migrations