Fix option data type on models