Added prefix/suffix and object declaration format settings