Finished adding support for null state