Fixed methods for api consistency