APOLLO-2645 Updated setters to use smart method