Cleaning up extend() implementation across the project