Added convenience class