APOLLO-3946 Updated inheritance