Add support to None values