A bit of refactoring. Some temporary features