Add default value for type
Merge branch 'feature/default_type' into develop