Removed components that could cause trouble and used private set