Adds missing return methods fixing issue #28