Added parsing logic