Added 'Description' objects and bunch of other shit