APOLLO-3482 Updated inheritance type