Added convenience method and general refactoring