Cleaned up extend invocation