Adding ability to handle numbers and bools