Updated topology to suport parsing