Better Overrides

Updating overrides to allow a more seamless integration and to rely more on `parent` for future-proofing.