Merged with latest changes form Alex (serialize/deserialze)