Added range and regex types