Added parsing to Shark