Added foundational support for Extras.