Added some extra properties