Updated options for constant types
Modified to use new model