Changed members to protected