Changed interfaces to use StateObject instead of raw map