Make return type annotation more specific