Add Attachment:DRY-16: Move complex class variable intializers to static initializer