Code refactoring. Addition of move base.