Remove dependency on extend