Fixed jsonify bug, added switchContainer