Model and parser extended and JSON serialisation implemented