Changed properties from public to private