Add bool and null handling.