Added ids and first version of parser