Change private fields to protected