Refactoring and extending convenient features.