Put back everything from devise- but pull out schema-plus