Adding changes to make this POC6 compliant.