Return class instead of instance