Improved and renamed some stuff. Added array of strings for class attributes.