added types table
Syn branch 'develop' with master