Added support for logicals