updated. Now parsing definitions