Added bool and int types support.