Added parsing for different display options