updated to use datatypes from failover branch