updated schema design to handle new types
Merge pull request #3 from gonzalovazquez/schema

updated schema design to handle new types