Updated extensions to support component definition.