Serialization support and persistence logic updates/fixes.
Controller fix.