Converted all public members to internal