Factor rest configuration, move to DB storage for data