Adjusted Attributes to allow custom order
added more logging