Added simple type restrictions