Added getters and switched over internal field references to getters.

AFDP-32