Better settings and added migration