General refactoring
Additional convenience class