Refactoring of basic operations;