Added formatting and kyro constructors