Updated parser
Updated design