Add correct return methods