Model: Changed from enums to int

Enums are not compatible with java 6
Merge remote-tracking branch 'origin/model'