Liquid migration model, code refactoring.