[TASK] Define visibility of fields explicitly

Change-Id: I2253d26913c94b393d47e61e53139e0f9135523d