Added class and delegate methods