Added Attributes to encapsulate single fields