Refactoring + new prod db