Removed manual parsing