Added integer property type; removed extra complicated and hard to work with option methodology