Added Number and Boolean values.