Refactored out class convenience methods