Updated getter API functionality