Added Boolean and Null argument types support