Adds better to parsing