More companion parsing