Added pointer return type support