APOLLO-3342 Conforms to interface