Made all sets internal and added constructors