Adding parsing logic