added support for None value